Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix rustc_codegen_gcc build and tests failure in CI #118706

Merged
merged 2 commits into from
Dec 7, 2023

Conversation

Urgau
Copy link
Member

@Urgau Urgau commented Dec 7, 2023

#118463 seems to have broke the PR CI, more specificaly the x86_64-gnu-llvm-16 builder which fail with:

Building stage1 codegen backend gcc (x86_64-unknown-linux-gnu)
     Compiling libc v0.2.147
     Compiling rustix v0.38.8
     Compiling memchr v2.5.0
     Compiling bitflags v2.4.0
     Compiling linux-raw-sys v0.4.5
     Compiling fastrand v2.0.0
     Compiling smallvec v1.10.0
error: invalid `--check-cfg` argument: `values(freebsd10)` (expected `cfg(name, values("value1", "value2", ... "valueN"))`)
  
error: could not compile `libc` (lib) due to previous error

Updating to libc version 0.2.150 fixes the build issue since it includes the support for the new check-cfg syntax.

Then it failed with a missing #![allow(internal_features)] in one of the example.

r? @GuillaumeGomez

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Dec 7, 2023
@rustbot
Copy link
Collaborator

rustbot commented Dec 7, 2023

Some changes occurred in compiler/rustc_codegen_gcc

cc @antoyo

@Urgau Urgau marked this pull request as draft December 7, 2023 14:04
@rust-log-analyzer

This comment has been minimized.

@antoyo
Copy link
Contributor

antoyo commented Dec 7, 2023

Seems like we would now need to specify -Ainternal_features for the failing test.

If it is needed for many tests, it might be simpler to just set CG_RUSTFLAGS="-Ainternal_features" globally.

@GuillaumeGomez
Copy link
Member

Seems like it fixes the failure introduced in #118463. Thanks for that! Let's approve it to unblock the merge queue.

@bors delegate=Urgau

@bors
Copy link
Contributor

bors commented Dec 7, 2023

✌️ @Urgau, you can now approve this pull request!

If @GuillaumeGomez told you to "r=me" after making some further change, please make that change, then do @bors r=@GuillaumeGomez

@Urgau Urgau changed the title Update rustc_codegen_gcc libc Fix rustc_codegen_gcc build and tests failure in CI Dec 7, 2023
@rustbot
Copy link
Collaborator

rustbot commented Dec 7, 2023

Failed to set assignee to ghost: invalid assignee

Note: Only org members with at least the repository "read" role, users with write permissions, or people who have commented on the PR may be assigned.

@Urgau Urgau marked this pull request as ready for review December 7, 2023 15:16
@Urgau
Copy link
Member Author

Urgau commented Dec 7, 2023

@bors r=@GuillaumeGomez p=1

@bors
Copy link
Contributor

bors commented Dec 7, 2023

📌 Commit 0ed3b68 has been approved by GuillaumeGomez

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 7, 2023
@bors
Copy link
Contributor

bors commented Dec 7, 2023

⌛ Testing commit 0ed3b68 with merge f16c81f...

@bors
Copy link
Contributor

bors commented Dec 7, 2023

☀️ Test successful - checks-actions
Approved by: GuillaumeGomez
Pushing f16c81f to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 7, 2023
@bors bors merged commit f16c81f into rust-lang:master Dec 7, 2023
12 checks passed
@rustbot rustbot added this to the 1.76.0 milestone Dec 7, 2023
@Urgau Urgau deleted the update-rccg-gcc-libc branch December 7, 2023 18:12
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (f16c81f): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
1.4% [0.9%, 2.0%] 3
Regressions ❌
(secondary)
3.6% [3.6%, 3.6%] 1
Improvements ✅
(primary)
-2.6% [-5.2%, -0.5%] 3
Improvements ✅
(secondary)
-2.1% [-2.1%, -2.1%] 1
All ❌✅ (primary) -0.6% [-5.2%, 2.0%] 6

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 673.714s -> 674.821s (0.16%)
Artifact size: 314.20 MiB -> 314.17 MiB (-0.01%)

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Dec 11, 2023
…askrgr

Fix again `rustc_codegen_gcc` tests

Similar to rust-lang#118706

r? `@GuillaumeGomez`
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Dec 11, 2023
…askrgr

Fix again `rustc_codegen_gcc` tests

Similar to rust-lang#118706

r? `@GuillaumeGomez`
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Dec 11, 2023
Rollup merge of rust-lang#118835 - Urgau:fix-rccg-gcc-tests, r=matthiaskrgr

Fix again `rustc_codegen_gcc` tests

Similar to rust-lang#118706

r? `@GuillaumeGomez`
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants